NB
Added collector
Emergency
Added current_scope
Merge branch collector