a little more accurate now