Make some changes tot class Ship