Calcs and Watcher improvements QS
Calcs and Watcher improvements QS