Added notes and queries