More modifications to the latest Player.java