merge
merging w/ aja's changes from yesterday