Added save-to-file option