Refactor work for additional robustness
Adding driver for merge
Small modification before merge