Now supports image saving