merging with jason