A couple of tweaks and more source material