update B/E separate kNN macros. Implement tHW signals