Refactor + only present not yet provided options