Updated final group solution