use always running in appropriate places

- still needs test