Made further additions and modifications
Resolved conflict