Added changes as suggested from the initial PR