Clarify based on comments