hmm, have some optimizations based on stu's commen...
# development
f
hmm, have some optimizations based on stu's comments