Change stuff up a bit