logic is modified in Save as draft