Final version

bug fixed