Updated for Thresh patch