comments functionality added