I give my 22 m.o diaper free time for a couple of hours a day for the last week. He poops on a potty (good boy). But he is willing to urinate on the potty every 5-10 minutes. It looks like he enjoys the new ability too much. Will it improve over time? Should I train him for full 2-3 days, or he still urinates too frequently?