New update method and bug fixes