Added watch wrapping