added endcomments to be killed as well