minor changes to last merge