rewrote habra validator