EFS: small changes to  valid