Final Commit by Luo Jian