Simplify logic to saveas