Adding tasks from Yanqing