changed loader structure