Module overhaul