Rejigger model so that it outputs correctly