changed loader a bit