kory's changes
kory's changes
merge fixes