Added manual overrides
Added manual overrides