Added working comments system