Changes for shippable