My changes up to this point