adding changes from james