Updated Changes to Salsa

full salsa.