Reverting back to old design
Mergetool