edited and made some comments for maggie to look at