Changed more stuff, to work with ImageLoader.java