Updated ship modeling