Many improvements in Watch object: try to reuse as much as possible