Merge with Jason