Added some changes, please merge.