Adds comments from Nick Hong