Alpha changes
Major perf improvements