Morgan Commit 4/23, changed memory allocation