zhangqi added and moved to s1gp