merge from Nick's fork