squashed coreset branch