add CJV everywhere
add CJV everywhere + update code for tau estimate