[FOLD] Final update