Committing code after making changes according to client feedback

Signed-off-by: shivram2609 <jaishivramji@gmail.com>