Completed implementation of comments