Lots of changes for oj 1.0