changes to stuff.
merging changes