Code changes as per comments
Code changes as per comments