performance/bug boost 21s to 1 s