merge lei's code
add more sensors