Implementing Brendan's changes to player