implemented changes suggested by DDG