adjusted model with get/set