cecelia's most recent version of the views
trying to fix these conflicts