Simplified the case