Undo some hardcoding kaend did