Added more code to shipping demo