sync with jwz version