Replaced old Player and Fish-class