Changes by Omega and Latest updates from Elv.