optimize codes
new pop test
final version
add points calc