merge from chris