TONS OF AWESOME CHANGES