refractored overrides merge