Calcs and Watcher improvements QS