add in shadown and go_die into comp unit