changed more references to catman