finish simple data fetch
little modify