#13 Change validation logic (unfinished).