Should work better, hopefully