change dead class to id for minor speed improvement
fix revert bug, finally