Signal #164-219 Improvements