Starting to finish the comment part