fixed loader to be removed here