merge from crenwick