image handeling changed