added validator + validation