I've made a few changes to how things wor