WIP on keepAssigned