Speaking modify some missing elements
Speaking modify some missing elements
merge