Updated Group exercise solution