Additional changes. Less memory used.