Agreed on this. Will modify accordingly and incorporate this.