Merging V4 and V5 overhaul