Update to new Salat & Casbah