merging evan's changes