adding partial overridding support