As I said above, code was copied. I will change so we can have a better candidate for upstream's code.