Added Individual and Grouped modes as separate functions - using both temporarily (waiting for multiple commits to check individual mode is working fine)