Grid Move Logic Changed
merge