changes to assignment flow, fix for restart hold behavior