final version?
adding group numbers.