Updated model.s