wip - updated Loader.php