Salsa Clave 0.2, now with variables