Added ability to choose where data is saved