updated for Note II