Added better image export