Improvements
Splitted the combination 'Pair'