minor rework