UPDATED COMMENTS FOR ALL