Added distributable version that actually works