simplifying and adding some Orchard specifics