latest code
few changes