improvemnets to efficiency but still re change required

Signed-off-by: krishnatejaperannagari <krishnatejaperannagari@gmail.com>