merge from peter