Implemented timer and improved move functions