minor changes, dylan made more changes
merge