first stanza
2nd stanza
merged changes