Fix for X move and Y move
Add new comments