Added some changes to new branch