grand update
moved returnstatementsignal to util package