Tweaks suggested by Alex