Massive performance overhaul