avoid extract path in preparation. faster prepare
add again lazy update