reworked according to review