changed the object deletion process & event passing