Comments Update - not finished yet
Code used in the lab during the test of July 11