adds untested memory
solves conflict
adds malatawy's donkey work