updated with comments from github