Revert "Revert "Added few Changes""

This reverts commit 854e1484f7b9a29c559943d89fe66d7b3e437e08.