merged dave's index page manually