Start of Re-Write 2 - Pass 6 - FINAL