total rework of model validation