updates commenting #1 #2 #3 #4