adding changes from comments