Changed Configuration JN,
Optimization