Replacign arch with ajira + few more corrections