Take 2 (some tuning)

bench: 8241642