Hopefully works better
Seems to work, slowly