add new flag for better control of data structure.
cosmetic changes