Dianas commit 5 - detailed group