Ucondition update

A lot of codes.. See commits for details.