adding dave's changes