Refactored and Added functionality for selecting Point System