TOTAL REVAMP OF COMMENTS PACKAGE