Optimize, clean and it's working. Nice perf, sorry Jonathan.