ongoing comet rework