Refactor SelectionChange
Fix Boundaries.next()