Updated according to the suggestions