Testing a few changes to reduce mem