Reduced timeout to 30 sec