Changes from my arch machine