Doing refactor for shipping.