added and tested invalidator