adding changes from before vacation