inculded some fix as per vimal req.