PlayerEditSate improvement