added changes to branch 1