fixed variable names
Removed unneeded Catalog override