Added more last minute memory changes