Deleted dave's changes by accident so I'm adding them back