merging jason's commits