made changes after feedback