This should be a second table
//INEDIT