Closer to final again with the new image loader