Good call @iloveitaly could you update this as well so that it is more efficient.