As always / Ops by omega. Merge with latest Elv changes....