base helper changes