new version of model and html