Copied from previous version
Started user validation