Updated wording and some future requirements