more changes from Vinod, and gitian.