adding Armin changes