Cleaned up JNP3.