further modify later data grabber and tidier