My ESP is getting an overhaul