Take 2 (corrected)

bench: 7665340