Further move performance improvements - very smooth now.