added in the fork which handles null cells