Added time limits and wait period