Revised no-voice-crossing for efficiency
Added test