changes for correcting failure due to no waiting after clicks