Changes from elv and ops from Omega