Added initial movement to position + refactoring