Instances should be grouped together properly now