merging ken's changes html