changed models for efficiency, trying to fix datatables