updating catman branch