Updated code to use Kristin's new catalog file.

See push title...