Refined comet class