tested the new functions
Merge branch 'master' of github.com:mindyruan/APCSHW