add the posibility to watch a safe source