updated from notes - hw not added