Changes to Ferris and Collector