some modifications to the overhaul