Updating timeout behaviour