Changed Omega to use Omega-Tree