Friday's work. Shouldn't cause anymore crashes