Use guard name for start moving
Fix overlap problem