Re-wire last watched to use API
3.0.125.0