Split arch logic into separate function (thanks, cstamas!)