Merging major overhaul changes