Incorporated a @fgregg notes