Josh changes

merged