My branch of comet_g4