Added scope watch to duration and repeat