PlayerEditState optimized. #13