Updated with material from the master playerproto