Update methods and comments