moved the old logic into the transport for now