Further work on the input validation...