merging before revamp