Tweaks suggested by @Daxter