Merge Changes from Jay