First version of improvements on Omega