Some changes to the new timeout variable