updated with Catcus