added notes and options parameters