refactor for new deliverly