tightening up control layer around variable watch