zdt1 refactor