Working on fixing memory error breaks