Completed move away from 2/3 separation (solves #1)