Changes needed for killicons