Player optimizations #13