took out some NULLs