changes from Josh