updated with comments2