Slight overhaul