prevalidation; perfomance fixes; rf