integrate new image code
bugz