Added more shipping code
Added notes