Changing timeout to 30secs