making suggested changes for gdestuynder  :)