Improve turnaround times

Improve turnaround times