Adding most up-to-date changes