[CatShareNet] Fixed and improved