Upped wait to 30 seconds