commiting the stuff from om1