Tweak Gather to make selection easier