Merge branch 'JD's_Branch'