udpates and bug fixed
udpates and bug fixed