Like this? It seems to be working much better!
Also, thanks for catching the delay. That tidied up movement a bit as well.