did some refactoring, can kill and be killed