Removed commented-out code. Updated the Loader