Better handeling of images