Simplified the conditional