Refactoring, dude position sync