accessory calculation changes and db changes