manually merged my edits into allison's