Better way (that actually works)