Added optional save.