added various overrides