loading is now faster(two requests)