Complete makeover, optimized almost everything