Nitish/Shruti: Bug Fixing