updates for master