Refactored out av-stream.