Changes from main branch