I implement here using the old master, before the newer changes. Let me change it to consistent with previous changes.