Adding back in watch mode