PlayerEditState improvement