now with support for Salah's model