Added some memory stuff back