merged edits - v0.1.1