Change TYPE to KIND