Fixing Nandan requirements