Replaced watch mechanic with external wrapper.