Changes to fork on 23greg23

please add to main branch