made some changes to data.models (not sure if correct)