updated for ship types