Made transform processing a bit more efficient