Updated CatsManager
Merge remote-tracking branch 'origin/GW's-Branch'