Refined with inputs from @yannick

Signed-off-by: Vivek Rai <vivekraiiitkgp@gmail.com>