Changed according to feedback