Completely revised the collector mechanism