none-recurrent oja redone a bit

-