much more reliable now