made changes as discussesd