new omi code, doesn't quite work