Cleaned up things nicely together with V6 Vivid