reworking comment section