tim's changes and files
fixed conflicts