updates to main
updates to main with merge complete