Data PopUp will have to change. @minar09 please look into this matter.