\Improve some more, still not working