Updated for clarity and consistency