Added tracking and comments