2nd submission

Found a bug with comments