Class Confliction and Other Updates