Disabled tumulong
Merged github edit to local edit