Mbriskar windup 336 (memory tweaks)

DO NOT MERGE