refactored draw-save to be able to use it without iitc