some changes to main stream