Refactor trip to VJ

Now it is not, but i consider changing this function and re-enabling it out of scope of this commit.