Correct bug, final week is week 24
Correcting bug (map to list convertion)
Groups are now passed as arguments