added back files that got lost in the merge
3 files changed