Redid the image handeling