Added blank and null back in