updated to use Norma watch