merge dan and josh changes