refactor, save location via .