review and changes