Added moving.
Optimize size a bit
Optimize size even more