Working in #45
Close #45
Fixed for shipModelOneZ