updating
syncing with tyler change
write up draft done
merge files