Second verse
merged changes