This was taking 95% of time