merging sam and khi's stuff
merging sam and khi's stuff