New version based on note v3.0