Additions / hacks on top of streisand