temporarily reintegrated into salama. new updates there