still not working, but better