More work on new player system