added shippable stuff