update for memory api changes
22 files changed