aligned version with salama mainstream