changed wait time from 20s to 2s