Incorporate Ronny's changes to FileLoader.java