removed code from entry model, added code to decision model instead --KW