add square map and billboard
update
merge
add midterm