Some improvements
This should b emore accurate