removed generic collector
renamed collector
Massaged collector so it's kinda generic
more generic massage