still not working, but closer than before