update codebase according to Runtime
memory management