* Fixing analysis of Barrel and CATS