Non-Player partial update & a fix