Changed timeout to 30s from 20s