My changes along with the original