Updated validators according to Gari's updates