Updated and streamlined.