Updated to use new scope+watch logic