quick change to reduce # of angular watches from 3k+ to about 600