merging files from tim's repo