merge from Patrick's