handle creation and death better