Added new handlers and prospective kill