Bug fixes

Use bar stream instead