Reduce running time

Reduce running time 2017-09-08T09:47:08+00:00