My changes and updates