merging ken's stuff
ignore