Update validate + hygiene