Merging Luke's changes w/ CITATION too