latest code after demo 16th feb