committed changes from bernard laptop