refactoring
fix rerun parts