-- Big improvements in memory efficiency