updates for latest version of trunk