adding DomO and some related changes