completed adding the comment functions