add activity-recognition and location-testing for location FROM PENKZHOU