shortened some lines, added lines before and after atonement