Hopefully more accurate now.