adaptions to shipping; see PR