[CHG] decreased memory footprint