Better moving logic
Better moving logic