Changes for running time