Move timeout around