More code merged from ship-simu