make changes said in previous commit