Updates pt2 - Comments