Lots of improvement, still not working