Samples updated to match the recent SALSA spec