Updated Collector, but not finished