latest version including updated shipping logic