reworked accorind to review