stuff
merging ryan's changes