still not quite there but seems a bit more accurate