Renamed variables and changed timeout time