merging ken's changes
merging ken's changes