moved $watch and $digest to Extras