Updated according to feedback