Merge steve's changes