Fredrick Ding's GSoC project, continued.