more comment reworking
more comment reworking