Add logging and a case in the save as