Validator is coorect now, waiting for test