Change wait to 8 seconds from 20