small changes, loader