merging matt's changes