refactor to update defaults