More efficient goal streams