changes after some feedback