Working selection & refactoring