merge from steve