added empty cell support