Sync with original, but with dispel moduel updated