merge from Chris Jackson