Added time limit paramater