Re-fix Move Machine

Also, this addresses the issue I had with MoveMachine that I contacted you about