Small change to use change token to drive refresh.

Many changes to get rid of yellow flags.