Changes functionality a bit, to make it easier to change.