still not really working, but less so