master changes

these are master changes