I've made some changes