Taking $GIFU to the next level