Comments and updates
Comments and updates Pt. 2