updated with new models