Added $watch back in