make changes as per suggestions