New uri logic