additions for testability.