Simplified logic