updates may 12
merge conflicts
data updates May 15