updates to merge with main branch