Work in progress on low mem mode