Implement changes on orchestral/memory@ce0f79c

Signed-off-by: crynobone <crynobone@gmail.com>