updating with stuff from om1