little modify
finish simple data fetch