Minor modifications, testing memory consumption... too high.