Changed again to use less RAM