Dev phase changes- Reduced running time