Change stuff around a bit