Improved selector control.
Added assignment change logic.