Clarified logic