Still not clean, but effective