Updated for new version of ooc-math and rock.