Provably all cat2 works properly now