Updated these overrides, keeping my preferred changes