merges dave's changes