Add 2 more sensors plus debug tools