Some modification on basic.cppwq