minor chanages
merge conflicts