Updated variant controller