re-enabling the other variants