oops updates from merge