changed according to feedback