merge
ken's suggestions