Updated model and controls