Manual overrides added