Server version 2.2, optimized runtime slightly