"ok here is the rest of my patch so everything can be seen in context :)" . . . .