Updated version added some changes comment if you like them