Changed waiting for selection to be by variants