Modified Loader.cs