minor reworking