More concise logic