Added stuff to kill fixes #3