it actually works now, mostly