Initial bug Fixing Nakul