Moved update method stuff