Updated for Omega