MAde some tweaks suggested by Wouter