added smart pointers insted of the simple, removed unnecessary dependency when bomb is blowing