Comments added and hidden debug messages