fixed and simplified fetching, now fully works