Incorporated various overrides