updates from prod, prep for migration