revalidator require working with some hackery.
Merged my revalidator hackery.