Final version

some changes made