Removed the second pass to see what it doing

It seems weird to have a second pass.

Let's see if it possible to do the same thing in some other way.