Revert away from wrapper and incorporate signals in initial model