updates for legacy master.