Made changes from notes in #32