Seems much more accurate