consolidated drawing, added more sample notes