Added some changes and notes