Erdong's patches added