Removed memory problems WIP