Updated to include notes