Update and comments