Update to handle saving and different targets