Increased waiting to 30 secs