merging jason's code into master