Changes to updates; more testing required