refacoring, incorporating ship movement