updated with some indexes
updated missing treatment table