Fixed up timing issue but self-kill seems to be an issue