Fixed super duper memory problems