testing new branch: removed some comments
Disable the third group. Cleaned the code
move back to two groups