Cleaned up JNP1.