some new lines removed and added a few minor details