Group some of the gems and add a couple new ones