Updated for testing multiple factors