MADS: Some refactoring in group scene 1