Replaces #30. Updated wording as suggested