Added some changes to last commit