committed changes from Nick