Merge, and WITH, TIME
WITH fix and export