previous changes
seg faulting on Katelyn's mac