Updated according to given suggestions