Added save location flexibility