updates needed after merge from master.