Improve physical mover further