finished updated model