now more flexible for new models