Added more third-party options; streamlined.