Changed timeout from 30 to 10 secs