Touched up Note impl