added oj and cleanup code