Added time limit option