Added manual overrides