simplify checks
switch to Emitter instead of Collection as a parent
switch to Emitter instead of Collection as a parent
clean