Added Errored Flagging, and changed timeout to 3 minutes and 5 seconds