merge from Reid