Upgraded to om 0.7.1