#Points 1-4 committed revised