Comment '1-3. To implement th...' to 'new check needed when fields are mandatory'