moving postal logic back into adapter