Untested additions to evoked code