add good selects refactored