Merge with cjf