Better documentation and change the note